Workflow improvements & bug fixes.