comment and style fixes