JavaDoc from hell commot

And a minor bugfix