Renamed Animation methods
Minor fixes