Cleaned up code, bettered Combo, fixing Draw