fixes in incremental solving algorithm