[pl] more rules, and more fixes