some cleanup and added tm_properties