Some more fixes
Some more testing