Mapped a few rivers (The Lorette and the Duberger, as well as the latter's main tributaries) and some peaks in the Charlesbourg/Orsainville area. Smaller rivers are a BITCH to do, especially in non-urban settings. I'm wondering whether the Rivière des Roches isn't actually undergrounded before it reaches the Duberger... Strange fact: AFAICT, the Lorette River starts as a field drain, which actually continues all the way down to the Cap-Rouge River.

Also added in most of the neighborhoods I could remember offhand. Big ones (Duberger, Les Saules, Orsainville...) as suburbs, smaller ones (Le Mesnil, Château-d'Eau) as hamlets: the only actual difference is the zoom level they appear at (it's not a good idea to make Bourg-Royal and Charlesbourg show at the same level, but Orsainville and Notre-Dame-des-Laurentides might be). I'm not clear whether the innermost ones (Montcalm, Saint-Soch, Saint-Sauveur, Saint-Sacrement, Vieux-Québec) are best put as hamlets or suburbs. I'll have to see whenb they render... Haven't yet decided whether to put in the Limoilou neighborhoods (Lairet and Maizerets). Would have put in Val-Saint-Michel and Bélair, but am not sure where best, and whether they are relevant. Not sure where exactly is Champigny either, or what are the actually used (if any) neighborhoods within Beauport, L'Ancienne-Lorette and Sainte-Foy/Sillery/Cap-Rouge.

Maybe a finer hierarchy could be achieved by using the village tag. I'll have to check what the results are.

At some point it would be desirable to trace the built area around the agglomeration, but the outdatedness of the Y!Map images makes that complicated.