More tc

TC cleanups and enhancements.