clarity tweaks to 3.1