various updates for 2nd level  mainly TF