Fixes to tx manager
Minor cleanups
Hacking away with machete. Tests a million miles from passing.