Add: a few minor improvements and fixings to the animation support.