tweaks and updates, andrey screwed up the electron regression