#430 ZOne 2 routes

And minimal changes at AgentNpc