sundry edits
fixed merge conflicts