More parsing work on Torrent