misc fixes and minor usability enhancements