revamp yet again with new options for splitting output into diff files