Validation fixes, add error states