Add some TODO's and tweak README.