Renumber TODOs
Fix host, path