SAT improvements (unfinished)