fixes for UI and error messages