fix a LOT of stuff
clean up