further improvements in WPS interface