more work cleaning up civic functioning and npcs working