YoutubeBatch: Completed rewriting
Fixes #458
Merges #479