adding error checking and finishing up airport services