More documentation and refactoring of the MPWrapper