Fix undocumented API change, add TODO list

ping @ptrr @foxycoder