All 2st Kickstart problems. Please help!?

Went out today with a couple of friends on my CR125. They were on a KTM300 and a GasGas300 and the little Husky went everywhere they did with no problems.

Thats the good part. The problem I had was that the kickstart gear is not retracting all the way so im getting a knocking noise as the gear touches the other gear slightly. I have just put a new kickstart spring and bush on and thought that had solved it but its still happening. Any ideas?

Finally had time to look at the bike today. Took the clutch out and the gear between the flywheel and kickstart gear doesnt sit very snug on its shaft. Is this normal? If i pull on it the kickstart gear doesnt touch it. Could it be a worn spacer behind the gear? If I put a thick spacer behind I think it would solve my problem. Any thoughts????

Check the parts book and see if it requires a spacer or washer and if its there.