quick refactor of tweening logic... seems to solve aforementioned bug