Update more email references
Fix typos
Make this more generalized