extract TODO, fix syntax highlighting