EDA-44: Last changes to the scripts, as well as fixed some typos into MessageStream.