Feature/txbuilder2

this fixes the later @unusualbob  comment. thanks.