README/TODO Cleanup