Applied some of Tilmann's edits