Coding Fixes and such

ok not sure what i write here that i didn't write in the commit