Resubmission This is a minor patch to adapt to upstream data format changes. Minor other bugfixes are included.