Nitcorn improvements & avoid double Tnits

The tnitter part was asked by @privat