[pl] some new rules, remove obsolete phrases, and much more disambiguation