more updates
more javadocs
comments from code review
Merge pull request #575 from john-hill/PLFM-2029

Plfm 2029