javadoc and small fixes