Error messaging fixes and code reorganization
Merge branch 'master' of git@github.com:kthlnkeating/M-Tools-Project.git