Fixed up comments, and removed obselete edits