Error display improvements, small structure changes