client async mode + minor improvements