Various comments / commenting changes.