Moar Bugfixes...

I hope it works this time XD