electric mode, some other fixes