Tweakage after some testing.  Getting closer.