updated comments, and whitespace fixes