A lot of updates

A lot of updates