Finished cleaning up comments
Misc comment updates