Various fixes and email style updates