First version of message analysis
Minor updates