issue fixes and enhancements