now playing and time counter added
bad merge fix?