Random 'torrents' improvements

Cosmetic changes mostly.