Bdk6's saving my ass.

Change structure, cleaned up a few errors, added Bdk6's pause until not
a spec char, etc.  I'm taking dication for Bdk6 :)