Text and minor bugfixes