bug fixes & enhancements v1