minor updates on client code