youve got the basics covered there, although and Espresso and a short black are the same thing, and I think that to a large extent, short black has slipped from the vernacular a little. It helps to know what it means, but it isnt any different to an espresso as far as I know
One question though, why would you put a macchiato in a glass? surely youd just serve that in the same cup as you would an espresso? a demitasse for instance?
good luck and enjoy your coffee journey!