more validation edits