Some adjustments, next: fix time control handling + finish corr play