more improvements to workbench