fixes for wait $n and winner *