Thanks very much Richard! I hate to be picky, but I think making the following changes might be helpful for the non-Germanophones:

Freiburg -> Fribourg/Freiburg

Genf -> Genève

Neuenburg -> Neuchâtel

Tessin -> Ticino

Waadt -> Vaud

Wallis -> Valais/Wallis