Add missing javadoc and review new code