lots of TFs based updates and a few other improvements