Fixed some game mechanics