Still half-broken but getting there