proxyReadWrite refactoring and other minor changes