Lots of updates
Add referenced figures