improve msgs and email