[pl] more disambiguation and some more rules