Small touch-ups
Merge branch 'master' into soda-submission