Standardised output file formats and added a couple of user options as per report