More updates and refactoring.
Merge branch 'master' of https://github.com/douglascraigschmidt/POSA-14