more PSR2 updates