Did I fully understand Steins;Gate? (Correct me if I'm wrong)

Just finished Steins;Gate and I’m trying to make sure I fully understood everything (haven’t watched Steins;Gate 0 yet). Would love if someone could confirm or correct me ?

In the beginning, Okabe is in a worldline within the Beta attractor field, where Kurisu is stabbed and he witnesses her death. In shock, he sends a D-Mail, which shifts him into a worldline within the Alpha attractor field. From there, each D-Mail causes a shift to another worldline within Alpha, all of which converge to Mayuri’s death.

Realizing this, Okabe understands that to save Mayuri, he needs to undo all the D-Mails. By reversing them, he shifts back to a worldline within the Beta attractor field, where Mayuri survives but Kurisu is dead again. Even knowing this, he decides to move forward after his conversation with Kurisu.

Later, still in Beta, during the rooftop scene, Suzuha comes from 2036 and asks Okabe to help stop World War III. Mayuri intervenes (As i've come to read this part is the Alt 23rd episode + steins gate 0), and Okabe decides not to go through with it, choosing to continue his life. As a result, World War III eventually happens. In that future, Okabe forms a resistance with Daru and they develop a time machine.

At some point, Okabe comes up with Operation Skuld and records a video message to send back to his past self. Suzuha travels back again and meets Okabe on the rooftop, but this time Mayuri pushes him to act.

Finally, Okabe carries out Operation Skuld while still in a Beta worldline. By successfully faking Kurisu’s death while keeping her alive, he breaks out of the Beta attractor field and shifts into the Steins Gate worldline. From there, he continues into the present where both Mayuri and Kurisu are alive.

Did I get this right or am I missing something important?