Fixed proxy class handing of read / write files
Various work on other classes