minor tweaks and enhancements