bunch of fixes for disequality and solver search