Update client to show more diagnostic and accept remote host as env