Reduced figure size and updated some fig