fixes that weren't uploaded
Merge pull request #10 from shans/tm2

fixes that weren't uploaded