Fix figures
Edits from Bob
Various standing fixes