minor mods to first draft