Fix typo
Upgrade tagging

Havent tested this yet, but it should work with both one filed torrents
and folders. Everything mixed, let's go crazy!!