refactoring and a couple bug fixes
Merge branch 'master' of github.com:CodeRetreatTO/projects