fix tableau organization; mapping outputs now correct