nsftnet matrix added, small improvements