Made first set of Bernhard's edits