Removed comment cruft and added a couple