loads of awesome fixes