UI tweaks, improved error handling