Bug fixes
Output file settings