Added tx fee handling (untested)