Resolve some merge issues. Minor edits. Fix some validation errors. Update Python version in workflow.