lots of awesome fixes