javadoc typos, a few methods made final