javadocs and other small fixes