- minor improvs to WPS client