Many improvements, result saving