fix for bugs introduced at the last minute
Merge branch 'master' of github.com:CodeRetreatTO/projects