more tbutils upgrades and integration