added in email and other tweaks