cleaned up a few modules
added tx TODOs