Fix up some cosmetic issue. Also fixed email delivery issue.