Lots of junk fixed

Changed god knows what