Some Fixes?
Merge branch 'anime' into anime_development