some corections, revert to an earlier state; TODO: check for diffs