Some minor changes
Fix autoplay