performance and workflow improvements