Shit load of fixes