bug fixes by lsale
Merge branch 'master' of https://github.com/doturner/BizarreExperiments