Add entityLocation to npcs
Improve trader inventory
Change item restrictions to use of items