Bug fixes and added checks to isEmailAddress()

basic bug fixes removed a redundant check and additional checks to make
sure there isnt more than one @ in the email address as that wouldn't
fit the pattern