extend a lot of stuff. move todo into README.md