Further implementation of solution monitor and related code changes.