Improving SPDC single-photon sources via extended heralding and feed-forward control. (29th May 2019)