Enhance won dialog, small bugfixes