shop and npc fix