Added proper links, todo