minor enhancements - #311