validattion fixes & unit tests; chng email