fixes track parse, and top level track collection