added links and more todo