Fix bugs, but game is do nothing at this point