Fixed error display and other small fixes