TMan - comments & cleanups