Added more mso modules.
Some other edits.