Some improvements to the solver and the random filler.