doc/tutorial/basics: various improvements

- added section for templates
- updated ambiguity in bottom.md
- several small fixes

Change-Id: Iac03e7b99eec1ea352cb30d815a8cfbfb6896b18
diff --git a/doc/tutorial/basics/Readme.md b/doc/tutorial/basics/Readme.md
index fa0deb7..3628a43 100644
--- a/doc/tutorial/basics/Readme.md
+++ b/doc/tutorial/basics/Readme.md
@@ -30,7 +30,7 @@
   - [Aliases](aliases.md)
   - [Emit Values](emit.md)
   - [Hidden Values](hidden.md)
-- Types and Values
+- Types ~~and~~ are Values
   - [Duplicate Fields](duplicates.md)
   - [Bottom / Error](bottom.md)
   - [Basic Types](types.md)
@@ -42,6 +42,7 @@
   - [Ranges](ranges.md)
   - [Predefined Ranges](rangedef.md)
   - [Lists](lists.md)
+  - [Templates](templates.md)
 - [Modules, Packages, and Instances](instances.md)
   - [Packages](packages.md)
   - [Imports](imports.md)
@@ -52,6 +53,6 @@
   - [List Comprehensions](listcomp.md)
   - [Field Comprehensions](fieldcomp.md)
   - [Conditional Fields](conditional.md)
-  - [Null or Error coalescing](coalescing.md)
+  - [Null or Error coalescing](coalesce.md)
   <!-- - Conversions -->
   <!-- - Functions (simulating) -->