a couple usability enhancements