Reorganise to put number-y things together.
More javadoc additions.