adding comments and simple editing