commenting fixes and such