[refactor] even more animation tweaks..