add chocolat alias
some adjustments