Various minor fixes:

- switch to single-line comments were appropriate
 - any methods on various objects that returned raw Future with no
   or poorly defined value now return a Future<this>
 - changed some line breaks etc. to improve readability