javadoc updates and cleanup