More javadoc, bugfix