2.07.2:Foffy123:18 Merc Fixes 5

Numbering should be good now, if somewhat out of order.