Fixing some passcode bugs, removing errant logging statement
Merge pull request #634 from khawkins/misc_fixes

Fixing some passcode bugs, removing errant logging statement