Fix raw_data_analysis, make output from principal/raw analysis similar.