[pl] new rules and more disambiguation...