more work on the tsm module

i know, this commit message sucks... but i have to leave now