[pl] more rules and improvements