V2 calculate state pension updates

Some more copy and logic updates that have come through from Hinrich.