remove some TODOs
added instruction in readme.md
merge