removing some links, fixing some others