Fix animation adn some little fixes