If I have a one way flight booked with a confirmed PP upgrade and I 'change' my ticket to add a return leg (thus presumably refaring my one way fare to a cheaper round trip fare), my upgrade on the outbound will stick, correct?

And another scenario: if I have a confirmed PP upgrade for 80 PP on a cheap economy fare, say T class, and I upfare to W, can I ask for 40 PP back?