cleanup
added address & flight