more tweaks to single_photon