multiple fixes and enhancements