Log ExecutionPlan state changes

and minor changes/fixes