FIx numbering.

Note that modifiers dont work yet.