Further updates to ZFinder Event and Electrons

Trying to get these classes ready to run, so lots of updates as they are
not yet stable.