Fixed and added some links