fix style
fix animation speed
Sync with master