Extended header: fixed several animation-related issues