-Fix: clean up, test (somewhat), and complete the API for waiting cargo