Fixed TouchAnimation that sometimes wasn’t setting the exact target values
Refactored a bit