better psf inference, more options