Many improvements, most tests are working now