Fix bogus D chord and try to tighten ending