Updated javadoc, small fixes