cleanup, fixed NICK command and channel contains()