* minor rearrangements
* added javadoc generation target