Shitload of fixes