animation polish, data fixes