add elements to workflow plus various fixes