some small edits throughout