Egamma (plus a few minor) updates