some npc updates

had some merging issues, should be okay. npcs have some "needs"
framework and the building prefabs have tags