Continued refinements to msgs