small improvments to nitcc