some fixes
fixes(tm)