Fix whole lot of crap