TMan - (comments & cleanups)++