Added a few changes to psf convolutor