[en] new rules, more disambiguation, doc changes