fixed all ns errors