Main solution cleanups.
Correct test for XModel, retrive input from MSG const ref.