Smaller rearrangements of the code.
The second try to compile JavaDocs. Still some warnings.