small fixes and UI messages