Npc Advisor with fixes and improvements