minor fixes based on user testing