Various changes to NNTP.php