Add track name to debugger display
Update todos