code style fixes
add javadoc to options categories