Lots of awesome fixes