wf-console improvements
wf-console improvements