Fixing Stuff

Ill keep adding stuff to this till its merged...