Fix typo and add more stuff for channels
more robust checking of nick collisions