Minor changes, also validation edits