Text edits and bugfixes