Linknode added, some minor changes