Tweaks and clarifications