more text cleanup plus a minor (haha) bugfix