Message System restore. Also, fixed #25