minor mods before creating yoder branch.