Cairo added to the team, plus minor fixes