Added new NPCs and merged EP2 NPCs