diff --git a/scripts/gendoc.py b/scripts/gendoc.py
index 2e303ea2..f7bde162 100755
--- a/scripts/gendoc.py
+++ b/scripts/gendoc.py
@@ -50,13 +50,13 @@ def load_with_adjusted_titles(filename, file_stream, title_level, title_styles):
     return "".join(rst_lines)
 
 
-
 def get_rst(file_info, title_level, title_styles, spec_dir):
     # string are file paths to RST blobs
     if isinstance(file_info, basestring):
+        print "%s %s" % (">" * (1 + title_level), file_info)
         with open(spec_dir + file_info, "r") as f:
             return load_with_adjusted_titles(file_info, f, title_level, title_styles)
-    # dicts look like {1: filepath, 2: filepath} where the key is the title level
+    # dicts look like {0: filepath, 1: filepath} where the key is the title level
     elif isinstance(file_info, dict):
         levels = sorted(file_info.keys())
         rst = []
@@ -144,12 +144,15 @@ def get_build_target(targets_listing, target_name):
                 # copy across the group of files specified
                 group_name = f[len("group:"):]
                 group = all_targets.get("groups", {}).get(group_name)
-                if not isinstance(group, list):
+                if not group:
                     raise Exception(
-                        "Tried to find group '" + group_name + "' but either " +
-                        "it doesn't exist or it isn't a list of files."
+                        "Tried to find group '" + group_name + "' but it " +
+                        "doesn't exist."
                     )
-                resolved_files.extend(group)
+                if isinstance(group, list):
+                    resolved_files.extend(group)
+                else:
+                    resolved_files.append(group)
             else:
                 resolved_files.append(f)
         build_target["files"] = resolved_files
@@ -173,6 +176,7 @@ def cleanup_env():
 
 def main(target_name):
     prepare_env()
+    print "Building spec [target=%s]" % target_name
     target = get_build_target("../specification/targets.yaml", target_name)
     build_spec(target=target, out_filename="tmp/full_spec.rst")
     run_through_template("tmp/full_spec.rst")
diff --git a/specification/modules/00_modules_intro.rst b/specification/modules/00_modules_intro.rst
new file mode 100644
index 00000000..e69de29b
diff --git a/specification/targets.yaml b/specification/targets.yaml
index c4828ef1..e492ad3c 100644
--- a/specification/targets.yaml
+++ b/specification/targets.yaml
@@ -14,18 +14,14 @@ targets:
       - 06_00_appendices.rst
 groups:  # reusable blobs of files when prefixed with 'group:'
   modules:
-    - modules/01_00_voip_events.rst
-    - modules/02_00_typing_notifications.rst
-    - modules/03_00_receipts.rst
-    - modules/04_00_content_repo.rst
-    - modules/05_00_end_to_end_encryption.rst
-    - modules/06_00_history_visibility.rst
-    # Mark a nested file dependency
-    - 1: modules/07_00_push_overview.rst
-      2: [modules/07_01_push_cs_api.rst , modules/07_02_push_push_gw_api.rst]
-title_styles:
- - "="
- - "-"
- - "~"
- - "+"
-
+      0: modules/00_modules_intro.rst
+      1:
+         - modules/01_00_voip_events.rst
+         - modules/02_00_typing_notifications.rst
+         - modules/03_00_receipts.rst
+         - modules/04_00_content_repo.rst
+         - modules/05_00_end_to_end_encryption.rst
+         - modules/06_00_history_visibility.rst
+         - 1: modules/07_00_push_overview.rst # Mark a nested file dependency
+           2: [modules/07_01_push_cs_api.rst , modules/07_02_push_push_gw_api.rst]
+title_styles: ["=", "-", "~", "+"]