added mroe of Bernhard's edits
more of bernhards edits