Docs fixes and TODO