Remove unneeded TODO
Removed commented out line
Fixes for link creation
Fixes for updating links
Latest fixes for link generation