Fixed a looot of stuff