NPC added and fixes