Added proper links and removed todo text.