fixing up comments and stuff