fixes for delta, pass all tests