minor fixes to white space and comments