minor fixes, enhancements