Work on error display
More work on error display
Merge remote-tracking branch 'origin/master'