Reorganising NPC IDs + small changes