Add/Fix some links