Tidying up. Nickserv stuff still not working entirely.