Tightened up some links and small stuff