minor updates and enhancements