fixing SOME of the things!