Removed some TB and fixed problems