tmsim improvements