Electron and photon leakage update

Adding a new (tiny) electron leakage uncertainty and update photon leakage numbers

Also does some cleaning to make the code (hardly) more readable, maybe

Needs validation...