Possible bugs, fixed.
Add client handlers to ts6.