minor bug fixes
Merge branch 'master' of github.com:andycasey/a-new-scope