many changes. test58 still fails, but trace seems reasonable. LOTS of cleanup to follow