Some work on javadocs. More on this later.