adding citizens and travelers, fixing other issues