minor improvements to enhance UX