update comments and fix some whitespace issues