did more work on e-mail issue though still broke