further workflow improvements