Additional commenting and regenerated JavaDoc
Code clean-up and reorganization by Eclipse.