Fixed a few bugs in the numbering.