Bunch of comment fixes and clean up