more animation fixes