[WIP] Hack in youtube 1080p support, clean up