Removed extraneous loop branching, fixed TorrentToMedia for PEP standards
Merged changed to upstream