rewritten NPC logic + some minor changes