Changed a lot of stuff for jets and photons