Updated wikimap for compatibility with October Wikipedia dump,
and added various correspondences.