Bug fixes and updated app.config