More suggestions from Christophe, and bug fixes.