Fix typo in previous commit, add some TODO items.