email refactored out
bug fixed