some more fixes need to be tested wth correct tf data