Message cleanup and corrected design doc