Fix some points discussed with Géraud, other small enhancements.