Minor tweaks
Merge branch 'newmodules' into jeff-francesca
merge