updates for trds 2.0 and some fixes