various fixes and enhancements