did some psr fixes