Add target email to email template. Bugfixes.