v1.3.4 thread safe client and code cleanup