Add validation messages to step 3.
Cleanup/re-specify validations