PSR update and bugfixes