Threading on Client and Bug fixes