Some NPC updates (please check Bron)