Merge pull request #963 from jlipps/master

misc fixes
get rid of some commented-out debug statements