A mole is defined as: 6.023 x 10^23 elementary units of "something." That something can be atoms, molecules etc. So yes I think you got that right.

Molar volume is defined as the volume occupied by one mole of an ideal gas at STP (standard temperature pressure) which is approximately 22.4 liters.