Added more NPCs.  Some AI tweaking