If the strut tension rings popped out, you either need new ones or you need to bend them open a little. If they do not put enough preload on the struts, they'll fall out again.
The rings should have a tab on one or both ends, I don't recall.
While you're in there, make sure the plastic (YES, PLASTIC!) wear parts on the shift forks are OK, now is the time to replace them.
The pump is a lot of fun to get back in. There is a trick to it.