more edits and resolution of issues 56 and 57