Various bug-fixes and changes that came out of the failed video
playback experiment.