Some more work in pretty_pv