rename and other stuff
fix tests
better printing