polishing and fixing a couple of typos
merge edits