Fix thinko
Add a few more TODOs