Matter is anything that "has mass and takes up space" or option B. Matter is everything, it does not need a physical state, it does not need two elements to combined chemically, and it also doesn't have to be important to human society. Mass has to have mass, and volume. Mass is the amount of weight a object has, and volume is how much space the object also has.
Hope this helps!