got rid of some debugging info and fixed a couple of things