Fixes and enhancements.