Complete eVista improvements, all tests pass.