A few more edits
merge - I ran into a conflict or two
Another merge