comments/edits throughout