Senate Addresses Air Traffic Control, Safety In FAA Bill