fix exports
convert token values to lists