Lots of updates

Lots of stuff