Bugfixes and text corrections