Some minor javadoc cleanup/improvements