update all to include email fixes #19