added better nick handling