3) what do you think of my modifications? Are there things to improve? 
errors ? oversights ?

From your subject line, I take you're talking about this changeset here?

Cordialement,
Raphael