Fixed some bugs, made gameplay better