Figure captions
More touchups
Merge branch 'master' into soda-submission

Just because