Improve performance and correctness of file playback, and correct some issues with the network stream