Fix numbering and such