Some final tweaks to language