progress, but still screwed some things up