Fixed up references. Added message validation solution