[en] some fixes and a new rule (more fixes to come)