revert changes
readd npc item stuff