more changes, trying to fix validation errors.