Added hydrogen, simplified fluids. Added matches!