Objets fixed
Npc added