fixed a lot of little tstr bugs.