added npc, bugfixes