Tweaks based on Brian's feedback.