diff --git a/doc/tutorial/basics/bytes.md b/doc/tutorial/basics/bytes.md
index 0d7cd00..6013e79 100644
--- a/doc/tutorial/basics/bytes.md
+++ b/doc/tutorial/basics/bytes.md
@@ -9,7 +9,7 @@
 Byte literals are defined with single quotes.
 The following additional escape sequences are allowed in byte literals:
 
-    \xnn    // arbitrary byte value defined as a 2-digit hexadecimal number
+    \xnn   // arbitrary byte value defined as a 2-digit hexadecimal number
     \nnn   // arbitrary byte value defined as a 3-digit octal number
 <!-- jba: this contradicts the spec, which has \nnn (no leading zero) -->
 
@@ -19,7 +19,7 @@
 a: '\x03abc'
 ```
 
-<!-- JSON result -->
+<!-- result -->
 `$ cue export bytes.cue`
 ```json
 {
diff --git a/doc/tutorial/basics/commas.md b/doc/tutorial/basics/commas.md
index e39dae3..6ee539b 100644
--- a/doc/tutorial/basics/commas.md
+++ b/doc/tutorial/basics/commas.md
@@ -25,7 +25,7 @@
 ```
 
 
-<!-- JSON result -->
+<!-- result -->
 `$ cue export commas.cue`
 ```json
 {
diff --git a/doc/tutorial/basics/commaslists.md b/doc/tutorial/basics/commaslists.md
index c109962..a58cc79 100644
--- a/doc/tutorial/basics/commaslists.md
+++ b/doc/tutorial/basics/commaslists.md
@@ -18,7 +18,7 @@
 ]
 ```
 
-<!-- JSON result -->
+<!-- result -->
 `$ cue export commas2.cue`
 ```json
 [
diff --git a/doc/tutorial/basics/comments.md b/doc/tutorial/basics/comments.md
index e7404ee..ead2ec8 100644
--- a/doc/tutorial/basics/comments.md
+++ b/doc/tutorial/basics/comments.md
@@ -14,11 +14,11 @@
 two: 2 // a line comment
 ```
 
-<!-- JSON result -->
+<!-- result -->
 `$ cue export comments.cue`
 ```json
 {
     "one": 1,
-    "two": 2,
+    "two": 2
 }
 ```
\ No newline at end of file
diff --git a/doc/tutorial/basics/curly.md b/doc/tutorial/basics/curly.md
index b19dcf9..32ed49b 100644
--- a/doc/tutorial/basics/curly.md
+++ b/doc/tutorial/basics/curly.md
@@ -17,7 +17,7 @@
 "two-and-a-half": 2.5
 ```
 
-<!-- JSON result -->
+<!-- result -->
 `$ cue export curly.cue`
 ```json
 {
diff --git a/doc/tutorial/basics/disjunctions.md b/doc/tutorial/basics/disjunctions.md
index b4876c1..031a068 100644
--- a/doc/tutorial/basics/disjunctions.md
+++ b/doc/tutorial/basics/disjunctions.md
@@ -12,6 +12,7 @@
 to define anything else than these two values.
 
 <!-- CUE editor -->
+_disjunctions.cue_
 ```
 conn: {
     address:  string
diff --git a/doc/tutorial/basics/fieldname.md b/doc/tutorial/basics/fieldname.md
index 944b724..54ba0ae 100644
--- a/doc/tutorial/basics/fieldname.md
+++ b/doc/tutorial/basics/fieldname.md
@@ -22,7 +22,7 @@
 }
 ```
 
-<!-- JSON result -->
+<!-- result -->
 `$ cue export fieldname.cue`
 ```json
 {
diff --git a/doc/tutorial/basics/fold.md b/doc/tutorial/basics/fold.md
index cb1eb0d..b1967e4 100644
--- a/doc/tutorial/basics/fold.md
+++ b/doc/tutorial/basics/fold.md
@@ -12,7 +12,7 @@
 outer middle inner: 3
 ```
 
-<!-- JSON result -->
+<!-- result -->
 `$ cue export fold.cue`
 ```json
 {
diff --git a/doc/tutorial/basics/foldany.md b/doc/tutorial/basics/foldany.md
index 0b6c938..5175d4b 100644
--- a/doc/tutorial/basics/foldany.md
+++ b/doc/tutorial/basics/foldany.md
@@ -16,7 +16,7 @@
 outer middle2 inner: 7
 ```
 
-<!-- JSON result -->
+<!-- result -->
 `$ cue export foldany.cue`
 ```json
 {
diff --git a/doc/tutorial/basics/numberlit.md b/doc/tutorial/basics/numberlit.md
index 382e6b2..0ee001b 100644
--- a/doc/tutorial/basics/numberlit.md
+++ b/doc/tutorial/basics/numberlit.md
@@ -18,7 +18,7 @@
 ]
 ```
 
-<!-- JSON result -->
+<!-- result -->
 `$ cue export numlit.cue`
 ```json
 [
diff --git a/doc/tutorial/basics/stringlit.md b/doc/tutorial/basics/stringlit.md
index 69c6c5a..b213392 100644
--- a/doc/tutorial/basics/stringlit.md
+++ b/doc/tutorial/basics/stringlit.md
@@ -27,7 +27,7 @@
     """
 ```
 
-<!-- JSON result -->
+<!-- result -->
 `$ cue export stringlit.cue`
 ```json
 {
diff --git a/doc/tutorial/basics/stringraw.md b/doc/tutorial/basics/stringraw.md
index cb0c903..d618984 100644
--- a/doc/tutorial/basics/stringraw.md
+++ b/doc/tutorial/basics/stringraw.md
@@ -27,12 +27,11 @@
     """##
 ```
 
-<!-- JSON result -->
+<!-- result -->
 `$ cue eval stringraw.cue`
 ```
-{
-    msg1: "The sequence \"\\U0001F604\" renders as 😄."
-    msg2: """
+msg1: "The sequence \"\\U0001F604\" renders as 😄."
+msg2: """
         A regular expression can conveniently be written as:
         
             #\"\\d{3}\"#
@@ -40,5 +39,4 @@
         This construct works for bytes, strings and their
         multi-line variants.
         """
-}
 ```
diff --git a/doc/tutorial/basics/templates.md b/doc/tutorial/basics/templates.md
index 7220f17..f24984d 100644
--- a/doc/tutorial/basics/templates.md
+++ b/doc/tutorial/basics/templates.md
@@ -32,7 +32,7 @@
 }
 ```
 
-<!-- JSON result -->
+<!-- result -->
 `$ cue eval templates.cue`
 ```
 job: {
diff --git a/doc/tutorial/basics/types.md b/doc/tutorial/basics/types.md
index 466a0fd..7f49e4c 100644
--- a/doc/tutorial/basics/types.md
+++ b/doc/tutorial/basics/types.md
@@ -7,12 +7,7 @@
 CUE defines the following basic types
 
 ```
-null
-bool
-string
-bytes
-int
-float
+null bool string bytes int float
 ```
 in addition to the error type mentioned in the previous section.