few more enhancements and bug fixes