added data-track-scroll attributes; general bug fixes