Several fixes, expecially with array init. Passes more tests