bugfixes and updated text strings