minor control updates
Merge pull request #140 from ehazlett/control-updates

minor control updates