fixing a bug and deleting a bunch of crap