added /kup nick; various improvements