Correct or not?

Underline the correct answer:

Today, the famous American astronaut Peggy Annette Whitson ( has just said / has just been saying) that she is going to retire. More than 500 people ( have been / have been going) to space, but Peggy ( has spent / has been spending) longer in space than any other woman. She ( travelled / has been traveling) to space every few years since 2002. As well as being an astronaut, Peggy ( has worked / has been working) as a researcher, a university lecturer and on the International Space Station. Our newspaper ( writes / has been writing) about her work for more than 15 years, and we wish her luck for the future!

My answer:

Today, the famous American astronaut Peggy Annette Whitson ( has just said / has just been saying) that she is going to retire. More than 500 people ( have been / have been going) to space, but Peggy ( has spent / has been spending) longer in space than any other woman. She ( travelled / has been traveling) to space every few years since 2002. As well as being an astronaut, Peggy ( has worked / has been working) as a researcher, a university lecturer and on the International Space Station. Our newspaper ( writes / has been writing) about her work for more than 15 years, and we wish her luck for the future!

Am I right?