cleanup; removed old SaveFields; minor bugfix; now properly solving NS again