More comments added, more gracefully sets values for X and O