Various additions for javadoc.