little bug fixes & enhancements