improve tfs
clean tfs
fix tests
bug fix