Added useful links and TODOs