Dagmar's bug fixes and new text