minor mods, typos