link list adjustments, fixes #71 and fixes #72