Minor fixes
Major fuckup