fix first round bugs