change PBFile.Formula and PBFile.SoftFormula to keep number of variables and number of constraints (cont'd)
replace CR/LF with LF in some .hs files