Fixed autoplay detection and some other bits