Fixed some game mechanic bugs