Updates to README/TODO