Updates in comments and other changes