more TODO changes see README.md