[pl] important changes in disambiguation and small fixes