minor changes and fixed email settings