Update docs, add some TODOs