minor enhancements and opts