more bug fixes and UX enhancements