adjust plm to new norms and simplify fit method