got rid of testing stuff, commented things