Adding TODOs and fixing docs.