Add track number to output
Better account for no data coming back
1.0.3