Some basic comment changes