added client support
updated security