Conservative strategy was used, maybe other typos remain. Rebased: Simon Goldschmidt <goldsimon@gmx.de>