some updates to libt2n macro