Minor bug fixes/update npc2.lua