support waiting for Bundle to finish running; minor changes