making b2g emails better, small template tweaks, code cleanup