Suzie fixes, other fixes, and commented debug statements
Merge branch 'master' of github.com:anidev/612-2013