better tcomment mapping