updates for trds 2.0 and couple other fixes