more PSR1/2 changes