fix typos
fix entry factory to not blow up emails