Bug fixes
Fixes on KotH and adding TDM

Prepairing TDM for the new record tracking and fixing a small bug on
KotH