- more fixes (should use test cases…)