update TODO
fix most of tests and style errors