Fixed some game play logic