Bugfixes and text corrections
Merge commit 'e0d4c36137f267e906ce05f608541148ecf7ef7e'
no message