fix submit, add missing units validation