egamma and muon updates to rereco