Fixed TDL
Some more things to do