Whole bunch of updates

blah