email store + tweaks