Various animation set changes and fixes