updates and comments
more edits
merge