Fix playing/paused issue, cosmetics