Done.
I also defaulted wait to True in stop.stop, since there since to be no way for the runner to pass it in and waiting seems like the most sensible thing to do. Else options like this and --clean have no use.