Documentation updates, and adding TODO