Fixed validation, still missing the modal to stay open :-/