Fixing some shizzle, broken some other shizzle