fixed up a bunch of stuff
fixed up a bunch of stuff