Pip amends

Small logic tweak, and some copy changes.