Remove debug code
Fix typos.  Closes #532