Code cleanup
Added configuration for displaying errors only
Added configuration for displaying errors only