added javadoc support for build
fixed build warning
cleanup