enhancements and issue fixes