general overhaul and data updates (esp. for TM 2.0)