Some cleanups

Fixed auto play on load.