Solve changes

Some further improvements to solve.

@maprieto FYI.