bug fixes, better validation, fixed check email