[fr] improved a few rules.