Newbie here with shift prob

Hi all just bought my 01 GP GTP three weeks ago love the car and the ride.I have two probs with it and hope someone can help me out. Every once in a while when I turn it off the key won't go all the way back and I have to play with it to get it back.The other prob is the every once in a while it won't come out of park and I have to stick a golf tee in a little hole beside the shifter.

Sounds like the ignition switch is getting pissy.