Fix bugs introduced with speedup
Merge branch 'master' of https://github.com/HansonDodge/DirtyGirl