Dev

Further cleanup of sorter and hidden nfo (was taking too long looking into the usual suspects)