Killer-of-Lawyers

Is there a fix for the take player control bug with Cait? I'm running into it too. Tried regenerating the shop, or spawning more of her in and nothing seems to fix it.

Hi. I accidently removed my archery quest instead of making it my active quest with a misclick. Can I recraft the archery class again and start over, or do I need to find the name of the quest I was on for the givequest command in the console?