finalizing zproxy changes