NPC Waric

Additional fixes (including the latest additions to the script)