fixes + added CSV Format