misc work and testing
a bit more tweaking.  (I could probably tweak this for the rest of my life, but then it won't be KISS anymore)