Fixed a loooot of stuff