A few small tweaks based on Anne's final suggestions.