* fixes and enhancements