edits throughout 1.1