Minor name changes
Add .tm_properties
cleanup
Minor cleanup.