Added option to not save aovs. Formatting fixes.