edited stuff
edited comments