fixup whitespace, comments etc.
add comments