Add other npc's as possible guard targets

All previous commits baked into one.