fixed ABNF, updated TODO.md