fix cornerkick and reset bugs