improved comments, cleanedup unneccesary methods