adding comments and such