some workflow improvements