Links & some other fixes