minor changes in solver