and other fixes, yeap, tests, i must write tests