Indentation of comments at bol and other improvements

Please use this one instead of #183 because this one is up-to-date with recent master and does not contain changes regarding lineup cascaded calls - we'll handle that separately as discussed.

Note that e80cc79 fixes issue #190.