Bugfixes and suggestions from Friederike