Improvements to c, tr, and tw