Updated workflow definition, minor tweaks