I think that’s the answer—well done. Good quiz by Peter. All told, this is not one of Wikipedia’s better articles, but it’s far from the worst I’ve encountered.