Fix O-drawing order & winning error