Add come cloud code and fix emails