Fix: validation and added final check prior to submit.