todo
fixed next track issues