Added mplayer support for subtitles.  Some minor cleanup