* almost fixed the fling bug