Fixing things, but still a lot to do.