Logic fixes & email text fixes