add some fixes for email addresses, etc