fixed name issue and some game logic