Added corrections from Christopher Chedeau.