minisat cleanup
more minisat cleanup