Fixes broken links and adds TODO