some fixes
draw win