Cleanup and better MP Parsing, plus one more test