couple of changes to error displays
Fixed some merge conflicts