Lots of updates

Lots of updates