Update to generate keyword matrix
tweak plot names