TODO.md: update
improve debug info and logging