minor fixes 1 + email settings