more changes including last renaming, re-include do-expression and some additonal rationale.