typos and minor javadoc/redundant code changes