adding comments and stuff