Adds some fixes offered by CodePro and some work on trying to get emails to be updated properly.