commit all of Marshall's current code minor mods