Initial push for email attachment and fix bad URLs.