Animation improvements, fixes