[pl] new rules and some fixes