fix references, correct wording in introduction
merge conflicts