Thank you for the tips. I'll be sure to check out the musical maze and will think about having a wander around Geneva to kill some time. I'd like to check out the lake. Unfortunately check-in doesn't open until 2hrs before departure so I might have to lug my ski gear around with me! I'll post if I find anything noteworthy on the day in case anyone else is looking for info down the line.
Many thanks...