I just finished watching Clannad and Clannad After Story. Now correct me if I;m wrong, but I am guessing that after Ushio died. Tomoya got his wish and resurrected his whole family or rewound time to the point where Nagisa gave birth to Ushio, but lived this time.

Also I am guessing by helping out his friends and then finally reconciling with his dad got him the light he needed for his wish?

I haven't played the game, but that's what I heard. Now on to my main question

How does the manga end? Is it a similar ending to AS or does something different happen? Also does it closely resemble the anime or vice versa?