Revert List->Map changes.
Fix numbering bug.