Merge branch 'claire' into default
Further improvements. Can (and must) be refined with everyone's ideas.