diff --git a/core/styles/tiddlywiki.css b/core/styles/tiddlywiki.css
index 477123e9b..19da28640 100644
--- a/core/styles/tiddlywiki.css
+++ b/core/styles/tiddlywiki.css
@@ -1,3 +1,12 @@
+/*
+TiddlyWiki
+Base CSS from Twitter Bootstrap plus TiddlyWiki-specific overrides
+*/
+
+/*
+Base Twitter Bootstrap
+*/
+
 /*!
  * Bootstrap v2.0.4
  *
@@ -4982,12 +4991,28 @@ a.badge:hover {
   visibility: hidden;
 }
 
+/*
+TiddlyWiki overrides of Bootstrap variables
+*/
+
+/*
+TiddlyWiki mixins
+*/
+
+/*
+Base re-definitions
+*/
+
 body {
   position: relative;
   padding-top: 40px;
   background: #eeeeee;
 }
 
+/*
+Tiddler styles
+*/
+
 .tw-story-element {
   position: relative;
   padding: 30px 30px 30px 30px;
@@ -5061,6 +5086,10 @@ a.tw-tiddlylink-missing {
   font-style: inherit;
 }
 
+/*
+Dropdown menus
+*/
+
 .tw-ticked-menu-item::before {
   position: absolute;
   left: 4px;
@@ -5085,6 +5114,10 @@ a.tw-tiddlylink-missing {
   top: -3px;
 }
 
+/*
+Buttons
+*/
+
 .btn-invisible {
   padding: 0;
   margin: 0;
@@ -5096,6 +5129,10 @@ a.tw-tiddlylink-missing {
   margin-right: 6px;
 }
 
+/*
+Split label
+*/
+
 .splitLabel {
   margin-right: 5px;
   font-size: 9.5px;
@@ -5117,6 +5154,10 @@ a.tw-tiddlylink-missing {
   border-bottom-right-radius: 3px;
 }
 
+/*
+Includes
+*/
+
 .javascript-source {
   padding: 18px 18px 18px 18px;
   border: 1px solid #888;
diff --git a/cssbuild/tiddlywiki.less b/cssbuild/tiddlywiki.less
index faacff996..c79068643 100644
--- a/cssbuild/tiddlywiki.less
+++ b/cssbuild/tiddlywiki.less
@@ -1,11 +1,17 @@
-// TiddlyWiki
-// CSS Overrides for Twitter Bootstrap
+/*
+TiddlyWiki
+Base CSS from Twitter Bootstrap plus TiddlyWiki-specific overrides
+*/
 
-// Base Twitter Bootstrap
+/*
+Base Twitter Bootstrap
+*/
 
 @import "twitter-bootstrap/less/bootstrap.less";
 
-// TiddlyWiki overrides of Bootstrap variables
+/*
+TiddlyWiki overrides of Bootstrap variables
+*/
 
 @baseFontSize:          14px;
 @baseLineHeight:        20px;
@@ -19,7 +25,9 @@
 @navbarText:                      @white;
 @navbarLinkColor:                 @grayLighter;
 
-// TiddlyWiki mixins
+/*
+TiddlyWiki mixins
+*/
 
 // This doesn't seem to work; trying to call it puts Less into an infinite loop
 .tab-size (@size) {
@@ -28,7 +36,9 @@
   -o-tab-size: @size;
 }
 
-// Base re-definitions
+/*
+Base re-definitions
+*/
 
 body {
 	position: relative; 		// So that height: 100% will fit to the body
@@ -36,7 +46,9 @@ body {
 	padding-top: @navbarHeight;	// Allow for the navbar
 }
 
-// Tiddler styles
+/*
+Tiddler styles
+*/
 
 .tw-story-element {
 	position: relative;
@@ -108,7 +120,9 @@ a.tw-tiddlylink-missing {
 	font-style: inherit;
 }
 
-// Dropdown menus
+/*
+Dropdown menus
+*/
 
 .tw-ticked-menu-item::before {
 	position: absolute;
@@ -132,7 +146,9 @@ a.tw-tiddlylink-missing {
 	top: -3px;
 }
 
-// Buttons
+/*
+Buttons
+*/
 
 .btn-invisible {
 	border: none;
@@ -145,7 +161,9 @@ a.tw-tiddlylink-missing {
 	margin-right: 6px;
 }
 
-// Split label
+/*
+Split label
+*/
 
 .splitLabel {
 	font-size: 9.5px;
@@ -168,6 +186,8 @@ a.tw-tiddlylink-missing {
 	background-color: #eee;
 }
 
-// Includes
+/*
+Includes
+*/
 
 @import "javascript.less";
diff --git a/tw5.com/tiddlers/roadmap/RoadMap.tid b/tw5.com/tiddlers/roadmap/RoadMap.tid
index cdcbd7b52..b87108796 100644
--- a/tw5.com/tiddlers/roadmap/RoadMap.tid
+++ b/tw5.com/tiddlers/roadmap/RoadMap.tid
@@ -8,37 +8,37 @@ TiddlyWiki5 is currently an alpha release, meaning that it is incomplete and sub
 
 There has already been a series of alpha releases of TiddlyWiki5. The goal of these releases is to test the new technical architecture and to explore user interface features.
 
-! Beta Release
-
-TiddlyWiki5 will progress to a beta release when it is feature complete.
-
 Some of the features and fixes required before the beta is declared include:
 
 * Synchronisation via HTTP in the browser
 * Synchronisation via direct file access under node.js
-* Operation with TiddlySpace
-* Operation with TiddlySpot
+* Preliminary integration with TiddlySpace
+* Preliminary integration with TiddlySpot
 * Saving changes to a file URI:// using Firefox
 * Move default tiddler storage from TiddlyWiki-style `<div>` elements to JSON
-* Ability to inspect and edit tiddler fields
-* WikiText table support
-* More user interface gadgets, including: tabs, popovers, toolbars, carousel, dropdown,
-* Checkbox support via tags
-** For example, `<<checkbox {filter} {tag} {template}>>` displays a filtered list of tiddlers along with a checkbox representing whether or not each tiddler carries the specified tag
-* Search
-* Tiddler themes and wiki themes
-* Text references: slices and sections, JSON references
 * Aliases/inheritance
 * Lazy loading
 * Better handling of binary tiddlers
+
+! Beta Release
+
+TiddlyWiki5 will progress to a beta release when it is practical for cautious everyday use.
+
+Some of the additional features under consideration during the beta include:
+
+* Ability to inspect and edit tiddler fields
+* WikiText table and block quote support
+* More user interface gadgets, including: tabs, popovers, toolbars, carousel, dropdown,
+* Checkbox support
+** For example, `<<checkbox {tag}>>` in a template displays a checkbox representing whether or not each tiddler carries the specified tag
+* Search
+* Tiddler themes and wiki themes
+* Text references: slices and sections, JSON references
 * Timed refreshed relative dates (eg, 'last modified 30 minutes ago')
 * Encrypted tiddlers and encrypted TiddlyWikis
+* Facebook, Twitter, G+ and LinkedIn macros
+* Integration with the browser back and forwards buttons
 
 ! 1.0 Release
 
 Hopefully, TiddlyWiki5 will reach version 1.0 around September. This is the point at which it is declared stable enough for general use. It will continue to improve and evolve after 1.0, although constrained to remain backwards compatible so that plugins and content created for version 1.0 will continue to work into the indefinite future.
-
-Some of the features under consideration for development after release 1.0 include:
-
-* Facebook, Twitter, G+ and LinkedIn macros
-