various tweaks. 100% test coverage.
Merge branch 'master' of github.com:noted/scholar