initial stab at msg improvements