Small documentation changes and more TODOs