Tonnes of fixes, oh boi you screwed up badly