Fix lots of stuff (I mean lots)