--- a/HTMLDocGenerator.st	Fri Nov 04 13:12:36 2016 +0100
+++ b/HTMLDocGenerator.st	Fri Nov 04 13:24:17 2016 +0100
@@ -378,9 +378,9 @@
             'can' 'you' 
             'to' 'in' 'at' 'of' 
             'also' 'with' 'without' 'all' 'any' 'how' 
-            'however' 'although' 'always' 
+            'however' 'although' 'always' 'either' 'neither'
             'anywhere' 'anyway' 'anything' 'anyone'
-            'not' 'but'
+            'not' 'but' 'else' 'elsewhere'
             'am' 'are' 'is' 'be' 'will' 'wont' 'won''t' 'do' 'don''t'
             'my' 'their' 'your' 'its'
             'one' 'two' 'three'
@@ -404,13 +404,18 @@
         ].    
     ].
 
+    "/ if we have a key like 'startWith:' in the list,
+    "/ and 'starts' is also there, place the 'startsWith:' entries into the same bin.
     kwic remapKeywordsWith:[:oldKey :knownMappings |
         |newKey|
 
         5 to:oldKey size - 1 do:[:len |
             newKey isNil ifTrue:[
-                (knownMappings includes:(oldKey copyTo:len)) ifTrue:[
-                    newKey := (oldKey copyTo:len).
+                |part|
+                
+                part := (oldKey copyTo:len).
+                (knownMappings includes:part) ifTrue:[
+                    newKey := part.
                 ].
             ].
         ].
@@ -2338,7 +2343,7 @@
         |ref lcWord ctx|
 
         ctx := (HTMLUtilities escapeCharacterEntities:(left contractAtBeginningTo:25))
-               ,' <b>',(HTMLUtilities escapeCharacterEntities:word),'</b> '
+               ,'<b>',(HTMLUtilities escapeCharacterEntities:word),'</b> '
                ,(HTMLUtilities escapeCharacterEntities:(right contractAtEndTo:25)).
         
         lcWord := word asLowercase.