Integrate Cezary's comments and start with Georg's.
Tabula rasa: Integrate first batch of Georg's comments.