Various layout and javadoc improvements.