for putting the drift pin back in there are 2 different ways...
the right way and the wrong way. each choice is 180 degrees different from the other choice. If it doesn't line up perfect, don't try to hammer it in anyway. Turn the shaft 189 degrees and tap it right in. Might test it with the drift pin punch to make sure it is correct. After making sure it is correct, I would start the pin in the axle on one side and push the drift pin through the hoke and part way into the axle, holding it in place to line up the hole and gently tap the drift pin in! Hope this make sense, If not, ask and someone will explain it.
Keith