add tagging, update welcome email content and from