bug fixes
Email test working WOOOPw WOOOP