fixed bug with psf, made ready the real production run