Misc comment fixes, and general cleanup