Lots of random stuff fixed