NEW : new flag for saving figures. All TODOs done