Verbiage tweaks to match new functionality