pl-review

Phil could you take a look and let me know what you think?
fix these classes.