First client side DT
some fixes