some more corrections (also: markup)