Add parameters to csv output, continue cleaning