minor enhancements and tweaks