- minor enhancements