Reduced dry and added comments