added handling of email - and minor changes