Change texts, minor bugfixes (refs #307)