Terms tweaks