Fix typo in docstring
Add various TODOs