added validate_email dependency
cleaned up some broken code