Winkler edit

The edit's and my answers done by Frank