adding minor photon updates, energy and SF (SF not done)