separated links and nodes, fixed minor issues