minor tweaks
Merge branch 'ben'