some  quick gui-backend changes before leaving for school
Merge branch 'master' of https://github.com/bsanders/softeng