checkstyle corrections, added javadoc, etc.
checkstyle and findbugs corrections