Various comment fixes and corrections