Multiple updates

Lots of updates