m5tools: more fixing dupes / ordering