Winner name support. Minor changes.