Updated links and todo