some client improvements