fixed some bugs, need to improve speed mechanics