First Arch improvements (mainly email)