updated TODO
more tests and better output