lots of awesome changes