Add number of links and another NaN fix