Update todo and fix broken links