Media player updates

Various updates/fixes to audio/video player. This should get things working properly for now so I can start the separation of the video player.