Cleanup, one bug fix for URL loading in the m3u8loader, etc.