Improvmenets to dist_client