Cleanups 1

3 otherwise unrelated cleanups and doc updates. Nothing spectacular here.
I usually put TODOs into column 1 to make sure they stick out and are not read as ordinary comments. Astyle only indents comments that are not in column 1.