More TT Fixes

- now fixed after tt algorithm changes (currentClass)
- Clean up (a little)