What is the molality and mole fraction of sodium chloride in a solution

prepared by dissolving 29.5 g NaCl into 212.7 g of H2O?

Would the molaity be 2.37 m NaCl and would the mole fraction be 0.0410?

m is correct. XNaCl is correct. Good work.