Updated electron definition, put back lepton truth-matching, MT, and dphi