Added various libraries (mostly in Canada), some other minor
changes to cattype and wikimap