Fixing things up (including grabbing deleted figures!)
Lots of moving things around, cleaning things up