Minor tweak and debug messages.  Input not yet working.