General update of lots of stuff