Tuesday afternoon update

Lots of updates - Tuesday afternoon update