Re-order torrentToMedia. fixes #185 #210 #218