Bugfix and text corrections