Minor: add some todo notes