fixed up all the crap!