Fixing autoplay bugs, jankbusting, refactoring