Dev

More changes to the sorter and some to nfos