corrected validation issues