Fixed up some announcement mailing issues, incorporated Andy's suggestions

Just needs a once over, Matt.